From 0c01be2b7c79bdd1e9a6317a3d2c860501603cc8 Mon Sep 17 00:00:00 2001 From: Keir Fraser Date: Wed, 14 Jan 2009 11:39:01 +0000 Subject: [PATCH] Remove unused XENMAPSPACE_mfn Not present in any stable release of Xen. Introduced for qemu-dm but not needed. Signed-off-by: Keir Fraser --- xen/arch/ia64/xen/mm.c | 5 ++--- xen/arch/x86/mm.c | 1 - xen/include/public/memory.h | 3 +-- 3 files changed, 3 insertions(+), 6 deletions(-) diff --git a/xen/arch/ia64/xen/mm.c b/xen/arch/ia64/xen/mm.c index 0483ce40f1..3583b3c27b 100644 --- a/xen/arch/ia64/xen/mm.c +++ b/xen/arch/ia64/xen/mm.c @@ -3295,13 +3295,12 @@ arch_memory_op(int op, XEN_GUEST_HANDLE(void) arg) spin_unlock(&d->grant_table->lock); break; - case XENMAPSPACE_gmfn: - xatp.idx = gmfn_to_mfn(d, xatp.idx); - case XENMAPSPACE_mfn: { + case XENMAPSPACE_gmfn: { struct xen_ia64_memmap_info memmap_info; efi_memory_desc_t md; int ret; + xatp.idx = gmfn_to_mfn(d, xatp.idx); if ( !get_page_from_pagenr(xatp.idx, d) ) break; diff --git a/xen/arch/x86/mm.c b/xen/arch/x86/mm.c index 13bffee00b..7cf1337806 100644 --- a/xen/arch/x86/mm.c +++ b/xen/arch/x86/mm.c @@ -3810,7 +3810,6 @@ long arch_memory_op(int op, XEN_GUEST_HANDLE(void) arg) break; case XENMAPSPACE_gmfn: xatp.idx = gmfn_to_mfn(d, xatp.idx); - case XENMAPSPACE_mfn: if ( !get_page_from_pagenr(xatp.idx, d) ) break; mfn = xatp.idx; diff --git a/xen/include/public/memory.h b/xen/include/public/memory.h index f0f502c3ee..ba4051e95f 100644 --- a/xen/include/public/memory.h +++ b/xen/include/public/memory.h @@ -206,8 +206,7 @@ struct xen_add_to_physmap { /* Source mapping space. */ #define XENMAPSPACE_shared_info 0 /* shared info page */ #define XENMAPSPACE_grant_table 1 /* grant table page */ -#define XENMAPSPACE_mfn 2 /* MFN */ -#define XENMAPSPACE_gmfn 3 /* GMFN */ +#define XENMAPSPACE_gmfn 2 /* GMFN */ unsigned int space; /* Index into source mapping space. */ -- 2.30.2